From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2011 07:36:37 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2266^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32;p=emacs.git

Merge from mainline.
---

4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32